env_dataflash: Move conditional compilation to Makefile

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

diff --git a/common/Makefile b/common/Makefile
index fea0cafbe934855db66178e2fa105a7d50c4327b..27f515b0676fc7c85994a4f5e653424fa1fbb9b6 100644 (file)
--- a/common/Makefile
+++ b/common/Makefile
@@ -50,7 +50,7 @@ COBJS-y += cmd_nvedit.o
 # environment
 COBJS-y += environment.o
 COBJS-y += env_common.o
-COBJS-y += env_dataflash.o
+COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o
 COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
 COBJS-y += env_flash.o
 COBJS-y += env_nand.o

diff --git a/common/env_dataflash.c b/common/env_dataflash.c
index 1d55a279c926f99a8597c65624b72b93a77c6c64..2254b9b491a5adc49556094b239a01bd61ecf107 100644 (file)
--- a/common/env_dataflash.c
+++ b/common/env_dataflash.c
@@ -18,9 +18,6 @@
  *
  */
 #include <common.h>
-
-#if defined(CONFIG_ENV_IS_IN_DATAFLASH) /* Environment is in DataFlash */
-
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
@@ -100,5 +97,3 @@ int env_init(void)
 
        return (0);
 }
-
-#endif /* CONFIG_ENV_IS_IN_DATAFLASH */